From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 22 Jan 2010 20:40:56 +0000 (-0500)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~5232^2~26
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=cf206f28eb11467aed7f5e03f3e4df7724fd98d2;p=emacs.git

Merge from mainline.
---

cf206f28eb11467aed7f5e03f3e4df7724fd98d2